Skip to content

ci/pinned:update#480141

Merged
MattSturgeon merged 4 commits into
NixOS:masterfrom
dyegoaurelio:ci-nixfmt-1.2.0
Jan 22, 2026
Merged

ci/pinned:update#480141
MattSturgeon merged 4 commits into
NixOS:masterfrom
dyegoaurelio:ci-nixfmt-1.2.0

Conversation

@dyegoaurelio

@dyegoaurelio dyegoaurelio commented Jan 14, 2026

Copy link
Copy Markdown
Contributor

Things done

  • ci/pinned: update
  • ci/nixf-diagnose: ignore builtins related rules
  • treewide: apply nixfmt 1.2.0

This gives us nixfmt 1.2.0.

From the nixpkgs-unstable channel at revision bde0902.

Changes for nixfmt (1.1.0 → 1.2.0):
NixOS/nixfmt@v1.1.0...v1.2.0

Changes for nixd (2.7.0 → 2.8.2):
nix-community/nixd@2.7.0...2.8.2

Changes for treefmt-nix:
numtide/treefmt-nix@5b4ee75...e96d59d

Changes for zizmor (1.20.0 → 1.21.0):
zizmorcore/zizmor@v1.20.0...v1.21.0

ci/nixf-diagnose: update configuration

Update nixf-diagnose configuration as per numtide/treefmt-nix@0c445aa
The new config output should be semantically equivalent.


  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@dyegoaurelio dyegoaurelio marked this pull request as draft January 14, 2026 20:18
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Jan 14, 2026
@wolfgangwalther wolfgangwalther removed their request for review January 14, 2026 20:23
Comment thread ci/default.nix Outdated
Comment thread ci/pinned.json Outdated
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions backport release-25.11 and removed 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Jan 15, 2026
@MattSturgeon

MattSturgeon commented Jan 15, 2026

Copy link
Copy Markdown
Contributor

Eval report LGTM: https://github.com/NixOS/nixpkgs/actions/runs/21031311391?pr=480141#summary-60468411383

The last update (#464869) showed slightly faster numbers, implying Nixpkgs itself has grown slower in the last two months, although GHA's performance at the time is also a variable when comparing against the last bump.

The real purpose of the report is to compare how different versions of nix handle the current evaluation. In this regard, we can see nixVersions.git and nixVersions.nix_2_32 in the lead for linux, although nixVersions.nix_2_31 is slightly faster on darwin. Recent lix versions have comparable performance, except on x86_64-linux.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jan 15, 2026
@dyegoaurelio dyegoaurelio force-pushed the ci-nixfmt-1.2.0 branch 4 times, most recently from 0c80242 to 1a07ef9 Compare January 15, 2026 13:25
@MattSturgeon

MattSturgeon commented Jan 15, 2026

Copy link
Copy Markdown
Contributor

When CI tries to build the docs tests it failes with a weird fetcher error:

https://github.com/NixOS/nixpkgs/actions/runs/21031985076/job/60470081430?pr=480141#step:10:47

error: Cannot build '/nix/store/f4h6638q6m0ardx9y875jga2ab67qbaq-source-salted-bdkkpviaq89r.drv'.
       > aiohttp.client_exceptions.ConnectionTimeoutError: Connection timeout to host https://www.gnu.org/software/coreutils/manual/html_node/cat-invocation.html

nix-build-uncached: nix build failed: exit status 1

The URL it's fetching is accessible: https://www.gnu.org/software/coreutils/manual/html_node/cat-invocation.html


Testing locally I can reproduce the issue both on master and this PR.

To be extra conservative, I used nix-build-uncahced from the previous pinned nixpkgs:

$ git worktree add ../pinned --detach ee09932cedcef15aaf476f9343d1dea2cb77e261
$ fish_add_path -a (nix-build ../pinned -A nix-build-uncached --no-out-link)/bin

Then I tried to build ci's manual-nixpkgs-tests attr on master and this PR:

$ nix-build-uncached ci -A manual-nixpkgs-tests

I also tried building the test against the old pinned nixpkgs:

$ nix-build --dry-run ci --arg nixpkgs ../pinned -A manual-nixpkgs-tests

The workflow job runs when matrix.builds contains manual-nixpkgs-tests:

- name: Build Nixpkgs manual tests
if: contains(matrix.builds, 'manual-nixpkgs-tests') && !cancelled()
run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixpkgs-tests

Which is true for the aarch64-linux run:

- runner: ubuntu-24.04-arm
name: aarch64-linux
systems: aarch64-linux
builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests]
desc: shell, docs

So maybe me testing locally on an x86_64-linux system is throwing me off.

Regardless, the fact that this job fails in my local testing, fails in this PR, but is successful for other PRs currently open is very confusing.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Jan 15, 2026
@nixpkgs-ci nixpkgs-ci Bot added 6.topic: nim Nim programing language 6.topic: cuda Parallel computing platform and API 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: lib The Nixpkgs function library 6.topic: games Gaming on NixOS 6.topic: julia Julia is a high-level, high-performance dynamic language for technical computing. 6.topic: php PHP is a general-purpose scripting language geared towards web development. 6.topic: nvidia Nvidia-specific issues and fixes labels Jan 20, 2026
@nixpkgs-ci nixpkgs-ci Bot added the 8.has: documentation This PR adds or changes documentation label Jan 20, 2026
@dyegoaurelio dyegoaurelio force-pushed the ci-nixfmt-1.2.0 branch 2 times, most recently from 070635e to 9608ab5 Compare January 20, 2026 23:53
@dyegoaurelio dyegoaurelio marked this pull request as draft January 21, 2026 15:26
@MattSturgeon

MattSturgeon commented Jan 22, 2026

Copy link
Copy Markdown
Contributor

(I've temporarily pushed #482470 here for testing purposes, will drop shortly)


EDIT:

Interestingly the "test" pull_request workflow didn't run (maybe because of the merge conflicts?), so I wasn't able to validate this PR against #482470.

However, the pull_request_target did run and this time it had enough base objects to fetch the ci-pin-bump commit. Therefore, CI passes(!)

This doesn't mean #482470 is irrelevant; it is still likely that future ci-bumps will run into the same issue with being unable to fetch the ci-pin-bump commit in a shallow clone. It may also be an issue again here, once rebased.

@nixpkgs-ci nixpkgs-ci Bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 22, 2026

@MattSturgeon MattSturgeon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 7 rebuilds seem reasonable; see my earlier comments w.r.t. the less obvious ones.

The version-eval-report also shows reasonable numbers for recent nix versions:

Versionaarch64-linuxaarch64-darwinx86_64-linuxx86_64-darwin
lixPackageSets.git.lix1458315788
lixPackageSets.lix_2_93.lix299105569119
lixPackageSets.lix_2_94.lix1428715888
nixVersions.git1238813288
nixVersions.nix_2_28176136192149
nixVersions.nix_2_301348314980
nixVersions.nix_2_311328616281
nixVersions.nix_2_321218612085
nixVersions.nix_2_331218512589

Evaluation time in seconds without downloading dependencies.

@Mindavi Mindavi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a brief review lgtm

@MattSturgeon

Copy link
Copy Markdown
Contributor

I realize the rest of @NixOS/nixpkgs-ci wasn't initially pinged for review, because the treewide change touched too many files leading to too many reviewer requests.

Regardless, I'm going to merge this now, to avoid @dyegoaurelio needing to rebase for merge conflicts again.

I expect the backport will need to be done manually, as the treewide reformat will likely be different on 25.11.

@MattSturgeon

Copy link
Copy Markdown
Contributor

The base branch has a hidden formatting conflict in pkgs/servers/x11/xorg/default.nix:

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0c1225237..803389ee8 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -219,7 +219,7 @@
   xwd,
   xwininfo,
   xwud,
-# keep-sorted end
+  # keep-sorted end
 }:
 _:
 {

keep-sorted has likely been added since this PR was last rebased, and its comments are now formatted differently with this PR.

This gives us nixfmt 1.2.0.

From the nixpkgs-unstable channel at revision bde0902.

Changes for nixfmt (1.1.0 → 1.2.0):
NixOS/nixfmt@v1.1.0...v1.2.0

Changes for nixd (2.7.0 → 2.8.2):
nix-community/nixd@2.7.0...2.8.2

Changes for treefmt-nix:
numtide/treefmt-nix@5b4ee75...e96d59d

Changes for zizmor (1.20.0 → 1.21.0):
zizmorcore/zizmor@v1.20.0...v1.21.0

-------

ci/nixf-diagnose: update configuration

Update nixf-diagnose configuration as per numtide/treefmt-nix@0c445aa
The new config output should be semantically equivalent.
- avoid treewide cleanup due to these new rules
- invalid nix code was getting auto fixed
@nixpkgs-ci

This comment was marked as resolved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: coq A formal proof management system 6.topic: cuda Parallel computing platform and API 6.topic: docker tools Open-source software for deploying and running of containerized applications 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: games Gaming on NixOS 6.topic: hardware Drivers, Firmware and Kernels 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: jitsi VoIP and instant messaging application with video conferencing capabilities 6.topic: julia Julia is a high-level, high-performance dynamic language for technical computing. 6.topic: lib The Nixpkgs function library 6.topic: module system About "NixOS" module system internals 6.topic: nim Nim programing language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nixos-container Imperative and declarative systemd-nspawn containers 6.topic: nvidia Nvidia-specific issues and fixes 6.topic: php PHP is a general-purpose scripting language geared towards web development. 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: testing Tooling for automated testing of packages and modules 6.topic: vim Advanced text editor 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

Status: ✅ Done
Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants